Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix nix patching for LLVM 18 #122911

Merged
merged 1 commit into from
Mar 23, 2024
Merged

Fix nix patching for LLVM 18 #122911

merged 1 commit into from
Mar 23, 2024

Conversation

Noratrieb
Copy link
Member

LLVM 18 now ships libLLVM*.so.*, so .so is not the sole extension anymore, which breaks the dylib detection. Oops! Adjust it to only search for .so somewhere.

fixes #122906

@rustbot
Copy link
Collaborator

rustbot commented Mar 22, 2024

r? @onur-ozkan

rustbot has assigned @onur-ozkan.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 22, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@clubby789
Copy link
Contributor

r=me when lint error is fixed

@Noratrieb
Fix nix patching for LLVM 18
60b97a2 
LLVM 18 now ships `libLLVM*.so.*`, so `.so` is not the sole extension
anymore, which breaks the dylib detection. Oops! Adjust it to only
search for `.so` somewhere.
@Noratrieb
Copy link
Member Author

@bors r=clubby789

@bors
Copy link
Contributor

bors commented Mar 22, 2024

📌 Commit 60b97a2 has been approved by clubby789

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 22, 2024
@Noratrieb
Copy link
Member Author

I'm also gonna
@bors p=1
because I know quite some people use NixOS and it would be nice if they could rebase

@workingjubilee
Copy link
Member

Kylo Ren gazes at this PR, and says, "...More."

@bors p=2

@bors
Copy link
Contributor

bors commented Mar 23, 2024

⌛ Testing commit 60b97a2 with merge c3b05c6...

@bors
Copy link
Contributor

bors commented Mar 23, 2024

☀️ Test successful - checks-actions
Approved by: clubby789
Pushing c3b05c6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 23, 2024
@bors bors merged commit c3b05c6 into rust-lang:master Mar 23, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 23, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c3b05c6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 671.167s -> 669.588s (-0.24%)
Artifact size: 315.03 MiB -> 315.05 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moxian moxian moxian left review comments

Assignees

@onur-ozkan onur-ozkan

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.

Bootstraps nix patching broke after LLVM 18
9 participants
@Noratrieb @rustbot @rust-log-analyzer @clubby789 @bors @workingjubilee @rust-timer @moxian @onur-ozkan